mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2026-09-09 18:03:21 +00:00
[ADF-3299] and [ADF-3300] upgrade to Angular and Material 6 (#3579)
* 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
committed by
Eugenio Romano
Eugenio Romano
parent
c510ec864d
commit
6b24bfb1d4
+1
-1
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
import { MinimalNodeEntity } from 'alfresco-js-api';
|
||||
import { Subject } from 'rxjs/Subject';
|
||||
import { Subject } from 'rxjs';
|
||||
|
||||
export interface AddPermissionDialogData {
|
||||
title?: string;
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ import { By } from '@angular/platform-browser';
|
||||
import { setupTestBed } from '@alfresco/adf-core';
|
||||
import { AddPermissionDialogComponent } from './add-permission-dialog.component';
|
||||
import { MinimalNodeEntity } from 'alfresco-js-api';
|
||||
import { Subject } from 'rxjs/Subject';
|
||||
import { Subject } from 'rxjs';
|
||||
import { AddPermissionDialogData } from './add-permission-dialog-data.interface';
|
||||
import { fakeAuthorityResults } from '../../../mock/add-permission.component.mock';
|
||||
import { AddPermissionPanelComponent } from './add-permission-panel.component';
|
||||
|
||||
+8
-8
@@ -19,7 +19,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { AddPermissionPanelComponent } from './add-permission-panel.component';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { SearchService, setupTestBed, SearchConfigurationService } from '@alfresco/adf-core';
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
import { of } from 'rxjs';
|
||||
import { fakeAuthorityListResult } from '../../../mock/add-permission.component.mock';
|
||||
import { ContentTestingModule } from '../../../testing/content.testing.module';
|
||||
import { DebugElement } from '@angular/core';
|
||||
@@ -63,7 +63,7 @@ describe('AddPermissionPanelComponent', () => {
|
||||
|
||||
it('should show search results when user types something', async(() => {
|
||||
searchApiService = fixture.componentRef.injector.get(SearchService);
|
||||
spyOn(searchApiService, 'search').and.returnValue(Observable.of(fakeAuthorityListResult));
|
||||
spyOn(searchApiService, 'search').and.returnValue(of(fakeAuthorityListResult));
|
||||
expect(element.querySelector('#adf-add-permission-type-search')).not.toBeNull();
|
||||
expect(element.querySelector('#searchInput')).not.toBeNull();
|
||||
typeWordIntoSearchInput('a');
|
||||
@@ -77,7 +77,7 @@ describe('AddPermissionPanelComponent', () => {
|
||||
|
||||
it('should emit a select event with the selected items when an item is clicked', async(() => {
|
||||
searchApiService = fixture.componentRef.injector.get(SearchService);
|
||||
spyOn(searchApiService, 'search').and.returnValue(Observable.of(fakeAuthorityListResult));
|
||||
spyOn(searchApiService, 'search').and.returnValue(of(fakeAuthorityListResult));
|
||||
component.select.subscribe((items) => {
|
||||
expect(items).not.toBeNull();
|
||||
expect(items[0].entry.id).toBeDefined();
|
||||
@@ -97,7 +97,7 @@ describe('AddPermissionPanelComponent', () => {
|
||||
|
||||
it('should show the icon related on the nodeType', async(() => {
|
||||
searchApiService = fixture.componentRef.injector.get(SearchService);
|
||||
spyOn(searchApiService, 'search').and.returnValue(Observable.of(fakeAuthorityListResult));
|
||||
spyOn(searchApiService, 'search').and.returnValue(of(fakeAuthorityListResult));
|
||||
expect(element.querySelector('#adf-add-permission-type-search')).not.toBeNull();
|
||||
expect(element.querySelector('#searchInput')).not.toBeNull();
|
||||
typeWordIntoSearchInput('a');
|
||||
@@ -114,7 +114,7 @@ describe('AddPermissionPanelComponent', () => {
|
||||
|
||||
it('should clear the search when user delete the search input field', async(() => {
|
||||
searchApiService = fixture.componentRef.injector.get(SearchService);
|
||||
spyOn(searchApiService, 'search').and.returnValue(Observable.of(fakeAuthorityListResult));
|
||||
spyOn(searchApiService, 'search').and.returnValue(of(fakeAuthorityListResult));
|
||||
expect(element.querySelector('#adf-add-permission-type-search')).not.toBeNull();
|
||||
expect(element.querySelector('#searchInput')).not.toBeNull();
|
||||
typeWordIntoSearchInput('a');
|
||||
@@ -135,7 +135,7 @@ describe('AddPermissionPanelComponent', () => {
|
||||
|
||||
it('should remove element from selection when is clicked and already selected', async(() => {
|
||||
searchApiService = fixture.componentRef.injector.get(SearchService);
|
||||
spyOn(searchApiService, 'search').and.returnValue(Observable.of(fakeAuthorityListResult));
|
||||
spyOn(searchApiService, 'search').and.returnValue(of(fakeAuthorityListResult));
|
||||
component.selectedItems.push(fakeAuthorityListResult.list.entries[0]);
|
||||
component.select.subscribe((items) => {
|
||||
expect(items).not.toBeNull();
|
||||
@@ -155,7 +155,7 @@ describe('AddPermissionPanelComponent', () => {
|
||||
|
||||
it('should always show as extra result the everyone group', async(() => {
|
||||
searchApiService = fixture.componentRef.injector.get(SearchService);
|
||||
spyOn(searchApiService, 'search').and.returnValue(Observable.of(fakeAuthorityListResult));
|
||||
spyOn(searchApiService, 'search').and.returnValue(of(fakeAuthorityListResult));
|
||||
component.selectedItems.push(fakeAuthorityListResult.list.entries[0]);
|
||||
|
||||
typeWordIntoSearchInput('a');
|
||||
@@ -174,7 +174,7 @@ describe('AddPermissionPanelComponent', () => {
|
||||
|
||||
it('should show everyone group when search return no result', async(() => {
|
||||
searchApiService = fixture.componentRef.injector.get(SearchService);
|
||||
spyOn(searchApiService, 'search').and.returnValue(Observable.of({ list: { entries: [] } }));
|
||||
spyOn(searchApiService, 'search').and.returnValue(of({ list: { entries: [] } }));
|
||||
component.selectedItems.push(fakeAuthorityListResult.list.entries[0]);
|
||||
|
||||
typeWordIntoSearchInput('a');
|
||||
|
||||
+5
-5
@@ -20,7 +20,7 @@ import { AddPermissionComponent } from './add-permission.component';
|
||||
import { AddPermissionPanelComponent } from './add-permission-panel.component';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { setupTestBed, NodesApiService } from '@alfresco/adf-core';
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
import { of, throwError } from 'rxjs';
|
||||
import { fakeAuthorityResults } from '../../../mock/add-permission.component.mock';
|
||||
import { ContentTestingModule } from '../../../testing/content.testing.module';
|
||||
import { NodePermissionService } from '../../services/node-permission.service';
|
||||
@@ -40,7 +40,7 @@ describe('AddPermissionComponent', () => {
|
||||
|
||||
beforeEach(() => {
|
||||
nodeApiService = TestBed.get(NodesApiService);
|
||||
spyOn(nodeApiService, 'getNode').and.returnValue(Observable.of({ id: 'fake-node', allowableOperations: ['updatePermissions']}));
|
||||
spyOn(nodeApiService, 'getNode').and.returnValue(of({ id: 'fake-node', allowableOperations: ['updatePermissions']}));
|
||||
fixture = TestBed.createComponent(AddPermissionComponent);
|
||||
element = fixture.nativeElement;
|
||||
nodePermissionService = TestBed.get(NodePermissionService);
|
||||
@@ -83,7 +83,7 @@ describe('AddPermissionComponent', () => {
|
||||
|
||||
it('should emit a success event when the node is updated', (done) => {
|
||||
fixture.componentInstance.selectedItems = fakeAuthorityResults;
|
||||
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(Observable.of({ id: 'fake-node-id'}));
|
||||
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(of({ id: 'fake-node-id'}));
|
||||
|
||||
fixture.componentInstance.success.subscribe((node) => {
|
||||
expect(node.id).toBe('fake-node-id');
|
||||
@@ -101,7 +101,7 @@ describe('AddPermissionComponent', () => {
|
||||
it('should NOT emit a success event when the user does not have permission to update the node', () => {
|
||||
fixture.componentInstance.selectedItems = fakeAuthorityResults;
|
||||
fixture.componentInstance.currentNode = { id: 'fake-node-id' };
|
||||
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(Observable.of({ id: 'fake-node-id' }));
|
||||
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(of({ id: 'fake-node-id' }));
|
||||
|
||||
let spySuccess = spyOn(fixture.componentInstance, 'success');
|
||||
fixture.componentInstance.applySelection();
|
||||
@@ -110,7 +110,7 @@ describe('AddPermissionComponent', () => {
|
||||
|
||||
it('should emit an error event when the node update fail', (done) => {
|
||||
fixture.componentInstance.selectedItems = fakeAuthorityResults;
|
||||
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(Observable.throw({ error: 'errored'}));
|
||||
spyOn(nodePermissionService, 'updateNodePermissions').and.returnValue(throwError({ error: 'errored'}));
|
||||
|
||||
fixture.componentInstance.error.subscribe((error) => {
|
||||
expect(error.error).toBe('errored');
|
||||
|
||||
+8
-8
@@ -19,7 +19,7 @@ import { SimpleInheritedPermissionTestComponent } from '../../mock/inherited-per
|
||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { InheritPermissionDirective } from './inherited-button.directive';
|
||||
import { NodesApiService, setupTestBed, CoreModule } from '@alfresco/adf-core';
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
import { of } from 'rxjs';
|
||||
|
||||
const fakeNodeWithInherit: any = { id: 'fake-id', permissions : {isInheritanceEnabled : true}, allowableOperations: ['updatePermissions']};
|
||||
const fakeNodeNoInherit: any = { id: 'fake-id', permissions : {isInheritanceEnabled : false}, allowableOperations: ['updatePermissions']};
|
||||
@@ -56,12 +56,12 @@ describe('InheritPermissionDirective', () => {
|
||||
}));
|
||||
|
||||
it('should be able to add inherited permission', async(() => {
|
||||
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeNoInherit));
|
||||
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeNoInherit));
|
||||
spyOn(nodeService, 'updateNode').and.callFake((nodeId, nodeBody) => {
|
||||
if (nodeBody.permissions.isInheritanceEnabled) {
|
||||
return Observable.of(fakeNodeWithInherit);
|
||||
return of(fakeNodeWithInherit);
|
||||
} else {
|
||||
return Observable.of(fakeNodeNoInherit);
|
||||
return of(fakeNodeNoInherit);
|
||||
}
|
||||
});
|
||||
fixture.detectChanges();
|
||||
@@ -76,12 +76,12 @@ describe('InheritPermissionDirective', () => {
|
||||
}));
|
||||
|
||||
it('should be able to remove inherited permission', async(() => {
|
||||
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithInherit));
|
||||
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithInherit));
|
||||
spyOn(nodeService, 'updateNode').and.callFake((nodeId, nodeBody) => {
|
||||
if (nodeBody.permissions.isInheritanceEnabled) {
|
||||
return Observable.of(fakeNodeWithInherit);
|
||||
return of(fakeNodeWithInherit);
|
||||
} else {
|
||||
return Observable.of(fakeNodeNoInherit);
|
||||
return of(fakeNodeNoInherit);
|
||||
}
|
||||
});
|
||||
component.updatedNode = true;
|
||||
@@ -97,7 +97,7 @@ describe('InheritPermissionDirective', () => {
|
||||
}));
|
||||
|
||||
it('should not update the node when node has no permission', async(() => {
|
||||
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithInheritNoPermission));
|
||||
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithInheritNoPermission));
|
||||
let spyUpdateNode = spyOn(nodeService, 'updateNode');
|
||||
component.updatedNode = true;
|
||||
fixture.detectChanges();
|
||||
|
||||
+20
-20
@@ -19,7 +19,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { PermissionListComponent } from './permission-list.component';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { NodesApiService, SearchService, setupTestBed } from '@alfresco/adf-core';
|
||||
import { Observable } from 'rxjs/Observable';
|
||||
import { of } from 'rxjs';
|
||||
import { NodePermissionService } from '../../services/node-permission.service';
|
||||
import { fakeNodeWithPermissions,
|
||||
fakeNodeInheritedOnly,
|
||||
@@ -57,16 +57,16 @@ describe('PermissionDisplayComponent', () => {
|
||||
});
|
||||
|
||||
it('should be able to render the component', () => {
|
||||
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithOnlyLocally));
|
||||
spyOn(nodePermissionService, 'getNodeRoles').and.returnValue(Observable.of([]));
|
||||
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithOnlyLocally));
|
||||
spyOn(nodePermissionService, 'getNodeRoles').and.returnValue(of([]));
|
||||
fixture.detectChanges();
|
||||
expect(element.querySelector('#adf-permission-display-container')).not.toBeNull();
|
||||
});
|
||||
|
||||
it('should render default empty template when no permissions', () => {
|
||||
component.nodeId = 'fake-node-id';
|
||||
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithoutPermissions));
|
||||
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeEmptyResponse));
|
||||
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithoutPermissions));
|
||||
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeEmptyResponse));
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(element.querySelector('#adf-no-permissions-template')).not.toBeNull();
|
||||
@@ -75,8 +75,8 @@ describe('PermissionDisplayComponent', () => {
|
||||
|
||||
it('should show the node permissions', () => {
|
||||
component.nodeId = 'fake-node-id';
|
||||
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithPermissions));
|
||||
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeEmptyResponse));
|
||||
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithPermissions));
|
||||
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeEmptyResponse));
|
||||
fixture.detectChanges();
|
||||
expect(element.querySelector('#adf-permission-display-container')).not.toBeNull();
|
||||
expect(element.querySelectorAll('.adf-datatable-row').length).toBe(4);
|
||||
@@ -84,8 +84,8 @@ describe('PermissionDisplayComponent', () => {
|
||||
|
||||
it('should show inherited label for inherited permissions', () => {
|
||||
component.nodeId = 'fake-node-id';
|
||||
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeInheritedOnly));
|
||||
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeEmptyResponse));
|
||||
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeInheritedOnly));
|
||||
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeEmptyResponse));
|
||||
fixture.detectChanges();
|
||||
expect(element.querySelector('#adf-permission-display-container')).not.toBeNull();
|
||||
expect(element.querySelector('#adf-permission-inherited-label')).toBeDefined();
|
||||
@@ -96,9 +96,9 @@ describe('PermissionDisplayComponent', () => {
|
||||
|
||||
it('should show locally set label for locally set permissions', () => {
|
||||
component.nodeId = 'fake-node-id';
|
||||
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithOnlyLocally));
|
||||
spyOn(nodePermissionService, 'getGroupMemeberByGroupName').and.returnValue(Observable.of(fakeSiteRoles));
|
||||
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeSiteNodeResponse));
|
||||
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithOnlyLocally));
|
||||
spyOn(nodePermissionService, 'getGroupMemeberByGroupName').and.returnValue(of(fakeSiteRoles));
|
||||
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeSiteNodeResponse));
|
||||
fixture.detectChanges();
|
||||
expect(element.querySelector('#adf-permission-display-container')).not.toBeNull();
|
||||
expect(element.querySelector('#adf-permission-locallyset-label')).toBeDefined();
|
||||
@@ -107,9 +107,9 @@ describe('PermissionDisplayComponent', () => {
|
||||
|
||||
it('should show a dropdown with the possible roles', async(() => {
|
||||
component.nodeId = 'fake-node-id';
|
||||
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithOnlyLocally));
|
||||
spyOn(nodePermissionService, 'getGroupMemeberByGroupName').and.returnValue(Observable.of(fakeSiteRoles));
|
||||
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeSiteNodeResponse));
|
||||
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithOnlyLocally));
|
||||
spyOn(nodePermissionService, 'getGroupMemeberByGroupName').and.returnValue(of(fakeSiteRoles));
|
||||
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeSiteNodeResponse));
|
||||
fixture.detectChanges();
|
||||
fixture.whenStable().then(() => {
|
||||
fixture.detectChanges();
|
||||
@@ -133,8 +133,8 @@ describe('PermissionDisplayComponent', () => {
|
||||
|
||||
it('should show the settable roles if the node is not in any site', async(() => {
|
||||
component.nodeId = 'fake-node-id';
|
||||
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithOnlyLocally));
|
||||
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeEmptyResponse));
|
||||
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithOnlyLocally));
|
||||
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeEmptyResponse));
|
||||
fixture.detectChanges();
|
||||
fixture.whenStable().then(() => {
|
||||
fixture.detectChanges();
|
||||
@@ -159,9 +159,9 @@ describe('PermissionDisplayComponent', () => {
|
||||
|
||||
it('should update the role when another value is chosen', async(() => {
|
||||
component.nodeId = 'fake-node-id';
|
||||
spyOn(nodeService, 'getNode').and.returnValue(Observable.of(fakeNodeWithOnlyLocally));
|
||||
spyOn(nodeService, 'updateNode').and.returnValue(Observable.of({id: 'fake-updated-node'}));
|
||||
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(Observable.of(fakeEmptyResponse));
|
||||
spyOn(nodeService, 'getNode').and.returnValue(of(fakeNodeWithOnlyLocally));
|
||||
spyOn(nodeService, 'updateNode').and.returnValue(of({id: 'fake-updated-node'}));
|
||||
spyOn(searchApiService, 'searchByQueryBody').and.returnValue(of(fakeEmptyResponse));
|
||||
component.update.subscribe((updatedPermission) => {
|
||||
expect(updatedPermission).not.toBeNull();
|
||||
expect(updatedPermission.name).toBe('Editor');
|
||||
|
||||
+11
-12
@@ -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');
|
||||
|
||||
@@ -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);
|
||||
})
|
||||
);
|
||||
})
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user